From 82ba15beeb74ccc9a3aba3ebeaffa7afd6e29483 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 6 Nov 2020 20:46:27 +0000 Subject: [PATCH] Remove references to bundled gtk-doc --- debian/README.source | 11 ----------- debian/clean | 2 -- debian/copyright | 24 ------------------------ 3 files changed, 37 deletions(-) delete mode 100644 debian/README.source diff --git a/debian/README.source b/debian/README.source deleted file mode 100644 index 82ff9e341e..0000000000 --- a/debian/README.source +++ /dev/null @@ -1,11 +0,0 @@ -Bundled copy of gtk-doc ------------------------ - -Until there is a gtk-doc release with -https://gitlab.gnome.org/GNOME/gtk-doc/-/merge_requests/30 merged, we need -to use gtk-doc from the gtk-doc-for-gtk4 git branch to document GTK 4. - -Check out an appropriate commit from upstream git, build a tarball with -"meson dist", put it next to the orig.tar.xz for GTK 4 itself and rename -it to gtk+4.0_${VERSION}.orig-gtk-doc-for-gtk4.tar.xz before importing a -new upstream version ${VERSION}. diff --git a/debian/clean b/debian/clean index c8a884ed79..9ef75f24e2 100644 --- a/debian/clean +++ b/debian/clean @@ -1,4 +1,2 @@ -gtk-doc-for-gtk4/ gtk/gtkdbusgenerated.c gtk/gtkdbusgenerated.h -subprojects/gtk-doc/ diff --git a/debian/copyright b/debian/copyright index 369cf9cf17..c129ca1853 100644 --- a/debian/copyright +++ b/debian/copyright @@ -397,30 +397,6 @@ Copyright: 2000 辛立仁 License: LGPL-2+ and LGPL-2.1+ and sun-permissive and lcs-telegraphics-permissive and X11R5-permissive and Expat and BSD-3-clause-Google and Apache-2.0 and CC0-1.0 -Files: gtk-doc-for-gtk4/* -Copyright: - 1996 X Consortium - 1998-2001 Damon Chaplin - 1998 Michael Zucchi - 1998 Owen Taylor - 2003 James Henstridge - 2007 David Necas (Yeti) - 2007 David Nečas - 2007-2018 Stefan Sauer - 2008 Andrew Collier - 2009 Rich Wareham - 2015 Christoph Reiter - 2015 Lautsprecher Teufel GmbH -License: GPL-2+ and autoconf-archive -Comment: - Taken from the gtk-doc git repository, gtk-doc-for-gtk4 branch. GTK 4 - introduces a new object feature, "actions", which need to be documented - as a first-class feature alongside signals and properties; the branch - implementing this has not yet been merged into the master branch - of gtk-doc, so we bundle a suitably branched copy here for now. - . - See debian/README.source for more details. - License: LGPL-2+ This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the -- 2.30.2